\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\97<span class=?p=vlc.git;a=rss" type="application/rss+xml" />
\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\97<span class=?p=vlc.git;a=rss;opt=--no-merges" type="application/rss+xml" />
\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\97<span class=?p=vlc.git;a=atom" type="application/atom+xml" />
\83Â\83Ã\82Â\83Ã\83Â\82Ã\82Â\83Ã\83Â\83Ã\82Â\82Ã\83Â\82Ã\82Â\97<span class=?p=vlc.git;a=atom;opt=--no-merges" type="application/atom+xml" />
Merge version 3.0.21-2+rpi1 and 3.0.21-6 to produce 3.0.21-6+rpi1